daddy 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGEyMjVlZDlmZjAwYTY5Yzk2YTg3YjRkN2IxMjI1NDg2MzcwNWY2OQ==
+    YjJjYWFmMDVmYTdiMGZhZWQwZTIwYTViMWRhM2U5MmFiODcwY2Y5Ng==
   data.tar.gz: !binary |-
-    MzkyOWZlMWQ5YjJjMjE2MDUzYWFlNmU1OGJkNzZhZTc3MGQwMDdlNw==
+    NzZkYmE0NTRlNDY1NWFjOTAxOGIyNzBlYWMwOGY0YWYyNjVmMmE4Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NWI1ODdlNWE5ZDYwNjkwYjkyNWFmYjU2NjljNjk4ZTdiNGU0NjExNDEzMDUz
-    M2Q4ZjRkZGZmNTBjMThlZjVjOGI4NmMwYjlhYjFmMWYyMzY5MTkxMDI1NjU2
-    ZDJmNzFmOGE0ZjU3MmZkNzRjZGQ1MTU3MTI5MDQ1ZGI4MTc2MGM=
+    YjZjNWYwOWY4MjY5ZGQ3ZjdiODk1ZTM3YTNkYTNlNWY4ZTBhNTk5YThlMTBl
+    ZDZjMjdjZGI1OTAyYzkzN2M3MDE5NDIzYzYwNzg4MWQ2ODIzYzIyODdjYzJi
+    YjQ2MDk0ZjY5OTcxNGQwMjljZDJmYjI5NDRiYTA1MmQ4NDYxYWU=
   data.tar.gz: !binary |-
-    NDZlYmNmZDRkZDA4ZDZiMzExNTQ1ZGMzMjk4Yzk0YjUzODM4YjQ5YWViNTQ2
-    YWQ5YmIwZWUxMmZmOTI2YjE4NjRkMDNkMjhkZjlhNDliNjRmMzM3Mzg5NWIy
-    MjFmZDYzNTU4ZTAwNGFiODZiNWFlZGIyZmM1Mjc0MGE0ZDJiZTI=
+    ZWQ4OTRhZGZiNjI0OTFlMDFjYmMyYTg1MmVjNTgyNzNhZDk5ZWYwMzdiOGY0
+    MDQ1Y2QzMWZkYWU3ZTJlMTdlNjcxM2QxNWJiYjliZWU4YzllODhmODViODJh
+    Mzc2N2E0YjRlY2YxYmVmMWJmMjg2MjY2ZjA3YzJjMTUxN2QxYzg=

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

@@ -20,6 +20,10 @@ end
   assert_choose value
 end
 
+もし /^(.*?) を空白にする$/ do |name|
+  assert_fill_in name, ''
+end
+
 もし /^(.*?) に (.*?) と入力(する)?$/ do |name, value, suffix|
   assert_fill_in name, value
 end

data/lib/daddy/formatter/daddy.css

@@ -57,6 +57,21 @@
   background: #F0F8FF;
 }
 
+.cucumber ol li.message, td ol li.message, th ol li.message {
+  border-left: 5px solid #999999;
+  border-bottom: 1px solid #999999;
+  background: #F0F8FF;
+  color: #001111;
+  margin-left: 10px;
+}
+
+.feature_dir {
+  font-size: 1.5em;
+  font-weight: bold;
+  padding: 2px;
+  margin: 10px 10px 0px 10px;
+}
+
 .step_contents {
   display: none;
   background: #FFFFFF;

data/lib/daddy/formatter/daddy_html.rb

@@ -0,0 +1,36 @@
+# coding: UTF-8
+
+module Daddy
+  module Formatter
+    module DaddyHtml
+      
+      def feature_dir(feature, short = false)
+        ret = ''
+        
+        split = feature.file.split('/')
+        split.reverse[1..-1].each_with_index do |dir, i|
+          break if dir == '仕様書' or dir == '開発日記'
+
+          if i == 0
+            if short
+              ret = dir.split('.').first + '.'
+            else
+              ret = dir
+            end
+          else
+            ret = dir.split('.').first + '.' + ret
+          end
+        end
+
+        ret
+      end
+
+      def should_expand
+        return false unless ENV['EXPAND']
+        return false if ['f', 'false'].include?(ENV['EXPAND'].downcase)
+        true
+      end
+
+    end
+  end
+end

data/lib/daddy/formatter/html.rb

@@ -4,6 +4,7 @@ require 'erb'
 require 'cucumber/formatter/ordered_xml_markup'
 require 'cucumber/formatter/duration'
 require 'cucumber/formatter/io'
+require 'daddy/formatter/daddy_html'
 
 module Daddy
   module Formatter
@@ -11,6 +12,7 @@ module Daddy
       include ERB::Util # for the #h method
       include ::Cucumber::Formatter::Duration
       include ::Cucumber::Formatter::Io
+      include Daddy::Formatter::DaddyHtml
 
       def initialize(runtime, path_or_io, options)
         @path_or_io = path_or_io
@@ -108,6 +110,14 @@ module Daddy
       end
 
       def before_feature(feature)
+        dir = feature_dir(feature)
+        if @feature_dir != dir
+          @builder << '<div class="feature_dir"><span class="val">'
+          @builder << dir
+          @builder << '</span></div>'
+        end 
+
+        @feature_dir = dir
         @feature = feature
         @exceptions = []
         @builder << '<div class="feature">'
@@ -144,7 +154,7 @@ module Daddy
       end
 
       def feature_name(keyword, name)
-        title = @feature.file.split('/').last.gsub(/\.feature/, '')
+        title = feature_dir(@feature, true) + @feature.file.split('/').last.gsub(/\.feature/, '')
 
         @builder.h2 do |h2|
           @builder.span(title, :class => 'val')
@@ -576,17 +586,17 @@ module Daddy
         @builder.script do
           @builder << inline_jquery
           @builder << inline_js_content
-          if ENV['EXPAND']
+          if should_expand
             @builder << %w{
               $(document).ready(function() {
                 $(SCENARIOS).siblings().show();
-                $('li.message').show();
+                $('li.message').hide();
                 });
             }.join
           else
             @builder << %w{
               $(document).ready(function() {
-                $(SCENARIOS).siblings().show();
+                $(SCENARIOS).siblings().hide();
                 $('li.message').hide();
                 });
             }.join
@@ -619,6 +629,7 @@ module Daddy
     $("#expander").click(function() {
       $(SCENARIOS).siblings().show();
     });
+    
   })
 
   function moveProgressBar(percentDone) {

data/lib/tasks/cucumber.rake

@@ -3,12 +3,13 @@
 require 'rake'
 
 namespace :dad do
+
   task :cucumber => :environment do |t, args|
-    phase_no = `git branch`.gsub(/[a-zA-Z]*/, '').to_i
     driver = ENV['DRIVER'] || :webkit
     pause = ENV['PAUSE'] || 0
     coverage = ENV['COVERAGE'] || true
-    options = "PHASE_NO=#{phase_no} DRIVER=#{driver} PAUSE=#{pause} COVERAGE=#{coverage}"
+    expand = ENV['EXPAND']
+    options = "DRIVER=#{driver} PAUSE=#{pause} COVERAGE=#{coverage} EXPAND=#{expand}"
     
     output_file = ENV['OUTPUT_FILE'] || 'index.html'
 

data/lib/tasks/cucumber_steps.rake

@@ -1,4 +1,4 @@
-# coding: utf-8
+# coding: UTF-8
 
 require 'rake'
 

data/lib/tasks/dad.rake

@@ -1,6 +1,7 @@
 # coding: UTF-8
+
 require 'rake'
 
 task :dad do
-  system('rake -aT | grep dad:')
+  system('rake -T | grep dad:')
 end

data/lib/tasks/db_config.rake

@@ -4,6 +4,8 @@ require 'rake'
 
 namespace :dad do
   namespace :db do
+    
+    desc 'database.yml を生成します。'
     task :config do
       pwd = `pwd`.strip
       command = "APP_NAME=#{File.basename(pwd)} erb -T - #{File.dirname(__FILE__)}/database.yml.erb > config/database.yml"

data/lib/tasks/db_create.rake

@@ -4,6 +4,8 @@ require 'rake'
 
 namespace :dad do
   namespace :db do
+    
+    desc 'database.yml に従ってDBを作成します。'
     task :create do
       config = YAML.load_file("#{Rails.root}/config/database.yml")
       

data/lib/tasks/diary.rake

@@ -0,0 +1,33 @@
+# coding: UTF-8
+
+require 'rake'
+
+namespace :dad do
+  
+  desc '本日用の日記を準備します。'
+  task :diary do
+    today = Date.today.strftime('%Y-%m-%d')
+
+    system("rake dad:cucumber:install")
+
+    today = Date.today.strftime('%Y-%m-%d')
+
+    feature = "features/開発日記/#{today}.feature"
+    if File.exist?(feature)
+      puts "すでに #{feature} が存在します。上書きはしません。"
+    else
+      system("echo '# language: ja'            >  #{feature}")
+      system("echo                             >> #{feature}")
+      system("echo '機能:'                         >> #{feature}")
+      system("echo                             >> #{feature}")
+    end
+
+    step = "features/step_definitions/開発日記/#{today}.rb"
+    if File.exist?(step)
+      puts "すでに #{step} が存在します。上書きはしません。"
+    else
+      system("echo '# coding: UTF-8'            >  #{step}")
+      system("echo                              >> #{step}")
+    end
+  end
+end

data/lib/tasks/jenkins

@@ -0,0 +1,100 @@
+## Path:        Development/Jenkins
+## Description: Configuration for the Jenkins continuous build server
+## Type:        string
+## Default:     "/var/lib/jenkins"
+## ServiceRestart: jenkins
+#
+# Directory where Jenkins store its configuration and working
+# files (checkouts, build reports, artifacts, ...).
+#
+JENKINS_HOME="/var/lib/jenkins"
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Java executable to run Jenkins
+# When left empty, we'll try to find the suitable Java.
+#
+JENKINS_JAVA_CMD=""
+
+## Type:        string
+## Default:     "jenkins"
+## ServiceRestart: jenkins
+#
+# Unix user account that runs the Jenkins daemon
+# Be careful when you change this, as you need to update
+# permissions of $JENKINS_HOME and /var/log/jenkins.
+#
+JENKINS_USER="jenkins"
+
+## Type:        string
+## Default:     "-Djava.awt.headless=true"
+## ServiceRestart: jenkins
+#
+# Options to pass to java when running Jenkins.
+#
+JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
+
+## Type:        integer(0:65535)
+## Default:     8080
+## ServiceRestart: jenkins
+#
+# Port Jenkins is listening on.
+# Set to -1 to disable
+#
+JENKINS_PORT="8081"
+
+## Type:        integer(0:65535)
+## Default:     8009
+## ServiceRestart: jenkins
+#
+# Ajp13 Port Jenkins is listening on.
+# Set to -1 to disable
+#
+JENKINS_AJP_PORT="-1"
+
+## Type:        integer(1:9)
+## Default:     5
+## ServiceRestart: jenkins
+#
+# Debug level for logs -- the higher the value, the more verbose.
+# 5 is INFO.
+#
+JENKINS_DEBUG_LEVEL="5"
+
+## Type:        yesno
+## Default:     no
+## ServiceRestart: jenkins
+#
+# Whether to enable access logging or not.
+#
+JENKINS_ENABLE_ACCESS_LOG="no"
+
+## Type:        integer
+## Default:     100
+## ServiceRestart: jenkins
+#
+# Maximum number of HTTP worker threads.
+#
+JENKINS_HANDLER_MAX="100"
+
+## Type:        integer
+## Default:     20
+## ServiceRestart: jenkins
+#
+# Maximum number of idle HTTP worker threads.
+#
+JENKINS_HANDLER_IDLE="20"
+
+## Type:        string
+## Default:     ""
+## ServiceRestart: jenkins
+#
+# Pass arbitrary arguments to Jenkins.
+# Full option list: java -jar jenkins.war --help
+#
+JENKINS_ARGS="--prefix=/jenkins"
+
+export QMAKE=/usr/bin/qmake-qt4
+export PATH="${PATH}":/usr/local/bin

data/lib/tasks/jenkins.conf

@@ -0,0 +1,3 @@
+ProxyPass /jenkins http://localhost:8081/jenkins
+ProxyPassReverse  /jenkins  http://localhost:8081/jenkins
+ProxyRequests     Off

data/lib/tasks/jenkins.rake

@@ -0,0 +1,28 @@
+# coding: UTF-8
+
+require 'rake'
+
+namespace :dad do
+  namespace :jenkins do
+
+    desc 'Jenkinsをインストールします。'
+    task :install do
+      [
+        "sudo bash #{File.dirname(__FILE__)}/jenkins_install.sh",
+        "sudo cp -f #{File.dirname(__FILE__)}/jenkins.conf /etc/httpd/conf.d",
+        "sudo cp -f #{File.dirname(__FILE__)}/jenkins /etc/sysconfig",
+        "sudo chown root:root /etc/sysconfig/jenkins",
+        "sudo chmod 600 /etc/sysconfig/jenkins",
+        "sudo wget http://updates.jenkins-ci.org/download/plugins/build-pipeline-plugin/1.3.3/build-pipeline-plugin.hpi -O /var/lib/jenkins/plugins/build-pipeline-plugin.hpi",
+        "sudo wget http://updates.jenkins-ci.org/download/plugins/git/1.1.26/git.hpi -O /var/lib/jenkins/plugins/git.hpi",
+        "sudo wget http://updates.jenkins-ci.org/download/plugins/rake/1.7.7/rake.hpi -O /var/lib/jenkins/plugins/rake.hpi",
+        "sudo wget http://updates.jenkins-ci.org/download/plugins/rubyMetrics/1.5.0/rubyMetrics.hpi -O /var/lib/jenkins/plugins/rubyMetrics.hpi",
+      ].each do |command|
+        puts command
+        system(command)
+      end
+    end
+
+  end
+
+end

data/lib/tasks/jenkins_install.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "ライブラリのインストール"
+  yum install httpd-devel libxslt-devel libxml2-devel qt-webkit-devel Xvfb
+
+echo "リポジトリ情報を取得"
+  wget -O /etc/yum.repos.d/jenkins.repo http://pkg.jenkins-ci.org/redhat/jenkins.repo
+  rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key
+
+echo "Jenkinsをインストール"
+  yum install jenkins

data/lib/tasks/publish.rake

@@ -6,8 +6,8 @@ namespace :dad do
   task :publish do
     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("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false OUTPUT_FILE=diary.html features/開発日記")
+    system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false OUTPUT_FILE=index.html features/仕様書")
 
     system("mkdir -p tmp")
 

data/lib/tasks/test.rake

@@ -3,6 +3,8 @@
 require 'rake'
 
 namespace :dad do
+  
+  desc 'Cucumberを使用してテストを実行します。'
   task :test => :environment do
     system("mkdir -p features/reports")
     system("bundle exec rake db:test:prepare")

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +126,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -211,16 +197,22 @@ files:
 - lib/daddy/git.rb
 - lib/daddy/formatter/menu.html.erb
 - lib/daddy/formatter/html.rb
+- lib/daddy/formatter/daddy_html.rb
 - lib/daddy/formatter/daddy.css
 - lib/daddy/formatter/cucumber.css
 - lib/daddy/formatter/jquery-min.js
 - lib/daddy/railtie.rb
+- lib/tasks/jenkins
+- lib/tasks/jenkins.rake
 - lib/tasks/dad.rake
 - lib/tasks/db_config.rake
 - lib/tasks/publish.rake
 - lib/tasks/cucumber_steps.rake
+- lib/tasks/jenkins_install.sh
 - lib/tasks/cucumber.rake
+- lib/tasks/jenkins.conf
 - lib/tasks/cucumber_install.rake
+- lib/tasks/diary.rake
 - lib/tasks/db_create.rake
 - lib/tasks/test.rake
 - lib/tasks/database.yml.erb