daddy 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjJjYWFmMDVmYTdiMGZhZWQwZTIwYTViMWRhM2U5MmFiODcwY2Y5Ng==
+    NjZmYWMzZGNhMDI5Zjg0NzE5OTZmNTFmOTM1OGJkMWQzMjk1MTAwZQ==
   data.tar.gz: !binary |-
-    NzZkYmE0NTRlNDY1NWFjOTAxOGIyNzBlYWMwOGY0YWYyNjVmMmE4Nw==
+    MjY4NWVjNmRjODRkYjZlY2I5M2U4MzU5ODMyYWVmYWM3OTFkYjA2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjZjNWYwOWY4MjY5ZGQ3ZjdiODk1ZTM3YTNkYTNlNWY4ZTBhNTk5YThlMTBl
-    ZDZjMjdjZGI1OTAyYzkzN2M3MDE5NDIzYzYwNzg4MWQ2ODIzYzIyODdjYzJi
-    YjQ2MDk0ZjY5OTcxNGQwMjljZDJmYjI5NDRiYTA1MmQ4NDYxYWU=
+    ZWJiYWViYTJkMTFlMmIyNGNmYjE2NmZjMzE2OTcwY2U1YzQ0NDQyZjFkYWFk
+    M2RjNWIxZGMxYjc3ZTY4NDg1NDhlMzlkMGNiYzM4YTEzNjMyNDA3NDYwOTRh
+    OTA4N2JmYjUyNjIxNmFiNWU5ODFkNWI5MDlhY2M0MWRjYTA2NjM=
   data.tar.gz: !binary |-
-    ZWQ4OTRhZGZiNjI0OTFlMDFjYmMyYTg1MmVjNTgyNzNhZDk5ZWYwMzdiOGY0
-    MDQ1Y2QzMWZkYWU3ZTJlMTdlNjcxM2QxNWJiYjliZWU4YzllODhmODViODJh
-    Mzc2N2E0YjRlY2YxYmVmMWJmMjg2MjY2ZjA3YzJjMTUxN2QxYzg=
+    YzU0YmRhYTQ5MTdiOTAxN2ZiNDlkMTY5ZmI2ZGYwNjA4N2E4YmZiZDRlZDZm
+    OWVkYzM5MDIzNDc2MjYyZGZhYmQyMzIzMjQ1ODFkYzhmYjhjYTA5OWY1ZDA3
+    NWI0ZjY5MTk1ODEyMjQ4ZmViZDZkZGU4YmMxMjY5MjBhZmY5NjA=

data/lib/tasks/cucumber.rake

@@ -5,18 +5,27 @@ require 'rake'
 namespace :dad do
 
   task :cucumber => :environment do |t, args|
-    driver = ENV['DRIVER'] || :webkit
-    pause = ENV['PAUSE'] || 0
-    coverage = ENV['COVERAGE'] || true
-    expand = ENV['EXPAND']
-    options = "DRIVER=#{driver} PAUSE=#{pause} COVERAGE=#{coverage} EXPAND=#{expand}"
-    
-    output_file = ENV['OUTPUT_FILE'] || 'index.html'
+    format = ENV['FORMAT'] || 'Daddy::Formatter::Html'
 
+    options = [
+      "DRIVER=" + (ENV['DRIVER'] || 'webkit'),
+      "PAUSE=" + (ENV['PAUSE'] || '0'),
+      "COVERAGE=" + (ENV['COVERAGE'] || 'true'),
+      "EXPAND=" + (ENV['EXPAND'] || 'true')
+    ].join(' ')
+    
     features = []
     ARGV[1..-1].each do |arg|
       features << arg unless arg.index('=')
     end
-    system("bundle exec cucumber --guess -r features -f Daddy::Formatter::Html #{options} #{features.join(' ')} > features/reports/#{output_file}")    
+
+    output_file = ENV['OUTPUT_FILE']
+    output_file ||= 'index.html' if format == 'Daddy::Formatter::Html'
+
+    output = "> features/reports/#{output_file}" if output_file
+    output = "-o features/reports" if format == 'junit'
+
+    ret = system("bundle exec cucumber --guess -r features -f #{format} #{options} #{features.join(' ')} #{output}")
+    fail unless ret    
   end
 end

data/lib/tasks/jenkins.rake

@@ -13,6 +13,8 @@ namespace :dad do
         "sudo cp -f #{File.dirname(__FILE__)}/jenkins /etc/sysconfig",
         "sudo chown root:root /etc/sysconfig/jenkins",
         "sudo chmod 600 /etc/sysconfig/jenkins",
+        "sudo mkdir /var/lib/jenkins/plugins",
+        "sudo chown jenkins:jenkins /var/lib/jenkins/plugins",
         "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",

data/lib/tasks/jenkins_install.sh

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

data/lib/tasks/publish.rake

@@ -4,10 +4,8 @@ require 'daddy/git'
 
 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 EXPAND=false OUTPUT_FILE=diary.html features/開発日記")
-    system("bundle exec rake dad:cucumber PUBLISH=true EXPAND=false OUTPUT_FILE=index.html features/仕様書")
+    system("bundle exec rake dad:test PUBLISH=true EXPAND=false OUTPUT_FILE=diary.html features/開発日記")
+    system("bundle exec rake dad:test PUBLISH=true EXPAND=false OUTPUT_FILE=index.html features/仕様書")
 
     system("mkdir -p tmp")
 

data/lib/tasks/test.rake

@@ -7,7 +7,12 @@ namespace :dad do
   desc 'Cucumberを使用してテストを実行します。'
   task :test => :environment do
     system("mkdir -p features/reports")
-    system("bundle exec rake db:test:prepare")
-    system("bundle exec rake dad:cucumber #{ARGV[1..-1].join(' ')}")
+    system("rm -Rf features/reports/*")
+    
+    ret = system("bundle exec rake db:schema:load RAILS_ENV=test")
+    fail unless ret
+
+    ret = system("bundle exec rake dad:cucumber #{ARGV[1..-1].join(' ')}")
+    fail unless ret
   end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - ichy