daddy 0.0.20 → 0.0.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmU2ZGRlYjZiOThiY2Q2NDQwOTBlM2FjNTZhMjdjMDE5MDY5YmRlZQ==
+    NWRjNDQxMTAwNDZhOTg3MjRhZWNlOWVmNTFjNzNkNjg5NjU0MWNlNg==
   data.tar.gz: !binary |-
-    NzgzZGEzYzRmY2Q2YzczMzY1ZGFkNWU0ODQ2MDBkN2NlYjBiZDU1NA==
+    NDFlNTIwZjUzODVjZTBkYTU2MTAwMGNmMDg2OTc4NjhkMjk3ZDQ2OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTI3ZjMwM2VkYmMyZWIxYjNmODU4MzNmOGU1M2RkMGY5Mzg1NGM1YTg4NWZj
-    MmI3MDA1MTkwNDE0ZmEzNjIxZjY0MGZlNDZiZTIzYjMyNzgyODc1Yjg2YmY3
-    MmJiMDYzNTJiZjdlOTliOThkY2Y0NGVhOGIxMDdjNjllMzQ0ZWU=
+    MDdmMTdmN2JmZGQ1ZTFlMTc0YjAzZWE1YzEzMTMyYTE4MjIxZGNkZDI0NWU3
+    N2MwYzg0Y2Q4NzBiMDNkMzczOGRjYWYwYWVlOTI5MTZlNWE1ZmFjYmEyZjgy
+    ZDk0Yjc2NzAwMDNjZDA5Njk0MzUyZTZlMWI4ZDBhYjczODMyZTI=
   data.tar.gz: !binary |-
-    MTRjNzZjZDRlYjVkYzRjOTBhNGY5NjVjZTRjYzMyODJmMDRkN2U1ZTFhNjM5
-    Y2JhYmYyODgyNTQ3MGQ2MjhjYzcxNTIxODFmMGU4YzFlYmRjNGRkODZlMzM1
-    ZTA2N2U3MjQ2NTYyZDVkYmVjNTRiMWQ5NDI0YmRkY2JiOTZmZWE=
+    ZjkwODIyZGYyMDA2NmEyODQ2ZjQ0NzI5ZWZiZDYxMTE4YzU0OWJiNTY2Mzhj
+    YWI0YWIwY2VhZjUwZjA1YjA2NmNjYTcyMDVlNjJhNWUwODk5M2U5MDk5OGEx
+    N2QxNzk5ODlkN2E4NDZmMDBiZTRkNTJmYTU3ZjA2ZDZlYTk0YmU=

data/lib/daddy/cucumber.rb

@@ -1,6 +1,7 @@
 # coding: UTF-8
 
 require 'cucumber/rails'
+require 'capybara/poltergeist'
 require 'capybara/webkit'
 require 'daddy/git'
 require 'differ'

data/lib/daddy/cucumber/capture.rb

@@ -17,15 +17,15 @@ module Daddy
     
         image = "#{@@_screen_count}.png"
     
-        if Capybara.current_driver == :webkit
-          page.driver.render("#{SCREENSHOT_DIR}/#{image}")
-        else
+        if Capybara.current_driver == :selenium
           page.driver.browser.save_screenshot("#{SCREENSHOT_DIR}/#{image}")
+        else
+          page.driver.render("#{SCREENSHOT_DIR}/#{image}")
         end
 
         puts %{
-          <div style="margin: 5px 0;">#{url}</div>
-          <div style="padding-right: 20px;"><img src="screenshots/#{image}" width="60%" height="60%"/></div>
+          <div>#{url}</div>
+          <img style="margin: 5px 0; background: #ffffff;" src="screenshots/#{image}"/>
         }
       end
     end

data/lib/daddy/cucumber/diff.rb

@@ -4,15 +4,13 @@ module Daddy
   module Cucumber
     module Diff
       
-      def git_diff(local_file, git_path = nil)
+      def git_diff(file, options = {})
         git = Daddy::Git.new
-        git_path ||= local_file 
-
-        a = File.read(local_file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
-        b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        a = File.read(file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        b = git.show_previous(file, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
         diff = format_diff(Differ.diff(a, b))
 
-        puts local_file
+        puts file
         puts "<pre>#{diff}</pre>"
       end
       

data/lib/daddy/formatter/daddy.css

@@ -7,6 +7,7 @@
   float: left;
   background: #FFFFFF;
   color: #000000;
+  margin-top: -10px;
 }
 
 #menu ol {
@@ -46,6 +47,11 @@
   font-weight: bold;
 }
 
+.cucumber ol li.step, td ol li.step, th ol li.step {
+  padding: 3px 3px 3px 10px;
+  margin: 5px 0px 5px 0px;
+}
+
 .cucumber ol li.passed, td ol li.passed, th ol li.passed {
   border-left: 5px solid #999999;
   border-bottom: 1px solid #999999;
@@ -76,10 +82,30 @@
   display: none;
   background: #FFFFFF;
   border: solid 1px #999999;
-  margin-left: 10px;
+  margin-left: 15px;
   padding: 10px;
 }
 
+div.background {
+  margin-left: 20px;
+}
+
+div.feature .narrative {
+  margin-left: 10px;
+}
+
+div.scenario .narrative {
+  margin-left: 20px;
+}
+
+div.scenario {
+  margin: 20px;
+}
+
+div.scenario ol {
+  margin-left: 20px;
+}
+
 div.scenario table {
   margin: 10px 0;
 }

data/lib/daddy/formatter/html.rb

@@ -207,15 +207,31 @@ module Daddy
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
         @step_number_in_scenario = 0
-        
-        @builder.span(:class => 'scenario_file') do
+
+        @builder.span(:class => 'scenario_file', :style => 'display: none;') do
           @builder << file_colon_line
         end
         @listing_background = false
+
+        lines = name.split("\n")
         @builder.h3(:id => "scenario_#{@scenario_number}") do
           @builder.span(keyword + ':', :class => 'keyword')
           @builder.text!(' ')
-          @builder.span(name, :class => 'val')
+          @builder.span(lines[0], :class => 'val')
+        end
+        
+        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
+          end
         end
       end
 
@@ -247,7 +263,7 @@ module Daddy
 
       def before_steps(steps)
         @step_count_in_scenario = steps.count
-        @builder << '<ol>'
+        @builder << '<ol style="display: none;">'
       end
 
       def after_steps(steps)
@@ -538,12 +554,20 @@ module Daddy
       end
 
       def build_step(keyword, step_match, status)
-        @step_number_in_scenario += 1
-        formatted_step_number = sprintf("%0#{@step_count_in_scenario.to_s.size}d", @step_number_in_scenario) 
+        if @in_background
+          display_keyword = keyword.strip + ' '
+        else
+          if keyword.strip == '*'
+            @step_number_in_scenario += 1
+            display_keyword = sprintf("%0#{@step_count_in_scenario.to_s.size}d", @step_number_in_scenario) + '. '
+          else
+            display_keyword = keyword.strip + ' '
+          end
+        end
 
         step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
         @builder.div(:class => 'step_name') do |div|
-          @builder.span("#{formatted_step_number}. ", :class => 'keyword')
+          @builder.span(display_keyword, :class => 'keyword')
           @builder.span(:class => 'step val') do |name|
             name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
           end
@@ -602,7 +626,6 @@ module Daddy
           else
             @builder << %w{
               $(document).ready(function() {
-                $(SCENARIOS).siblings().hide();
                 $('li.message').hide();
                 });
             }.join

data/lib/daddy/git.rb

@@ -12,7 +12,7 @@ module Daddy
     def self.sub_dir=(sub_dir)
       @@sub_dir = sub_dir
     end
-    
+
     def branches(remote = false)
       branches = []
       `git branch -a`.split("\n").each do |b|

data/lib/tasks/jenkins.rake

@@ -13,16 +13,32 @@ 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 mkdir -p /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",
-        "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
+
+      plugins = [
+        {:name => 'build-pipeline-plugin', :version => '1.3.3'},
+        {:name => 'git', :version => '1.1.26'},
+        {:name => 'rake', :version => '1.7.7'},
+        {:name => 'rubyMetrics', :version => '1.5.0'},
+        {:name => 'htmlpublisher', :version => '1.2'},
+      ]
+      plugins.each do |p|
+        download_path = "tmp/#{p[:name]}.hpi"
+
+        unless File.exist?(download_path)
+          command = "sudo wget http://updates.jenkins-ci.org/download/plugins/#{p[:name]}/#{p[:version]}/#{p[:name]}.hpi -O #{download_path}"
+          puts command
+          system command
+        end
+        
+        plugin_path = "/var/lib/jenkins/plugins/#{p[:name]}.hpi"
+        system("sudo cp -f #{download_path} #{plugin_path}")
+      end
     end
 
   end

data/lib/tasks/nginx.conf.erb

@@ -1,7 +1,3 @@
-upstream jenkins {
-  server localhost:8081;
-}
-
 upstream unicorn {
   server unix:/tmp/unicorn.sock;
 }
@@ -17,14 +13,34 @@ server {
   server_name localhost;
   
   root <%= ENV['RAILS_ROOT'] %>/public;
-
   try_files $uri/index.html $uri @app;
   
   location @app {
     proxy_pass http://unicorn;
   }
-  
-  location /jenkins {
-    proxy_pass http://jenkins;
+
+  location ~ ^/(assets)/ {
+    gzip_vary on;
+    gzip_static on;
+    expires 1y;
+    add_header Cache-Control public;
+    add_header ETag "";
   }
+
+<% if ENV['JENKINS'].to_s.downcase == 'true' %>  
+  location /jenkins/ {
+    root /var/cache/jenkins/war;
+    proxy_pass http://localhost:8081/jenkins/;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  }
+<% end -%>
+
+<% if ENV['PUBLISH'].to_s.downcase == 'true' %>
+  location /spec/ {
+    root /var/lib/daddy;
+  }
+<% end -%>
+
 }

data/lib/tasks/nginx.rake

@@ -22,9 +22,17 @@ namespace :dad do
       end
 
       rails_root = ENV['RAILS_ROOT'] || Rails.root
+      jenkins = ENV['JENKINS'] || false
+      publish = ENV['PUBLISH'] || false
+
       ret = system("RAILS_ROOT=#{rails_root} erb -T - #{File.dirname(__FILE__)}/nginx.conf.erb > tmp/nginx.conf")
       fail unless ret
       system("sudo cp -f tmp/nginx.conf /etc/nginx/conf.d/nginx.conf")
+      
+      if publish
+        system("sudo mkdir -p /var/lib/daddy")
+        system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} /var/lib/daddy")
+      end
     end  
 
   end

data/lib/tasks/phantomjs.rake

@@ -0,0 +1,24 @@
+# coding: UTF-8
+
+require 'rake'
+
+namespace :dad do
+  namespace :phantomjs do
+
+    desc "PhantomJSをインストールします。"
+    task :install do
+      name = 'phantomjs-1.9.0-linux-x86_64'
+      file = "#{name}.tar.bz2"
+      unless File.exist?("tmp/#{file}")
+        system("wget https://phantomjs.googlecode.com/files/#{file} -O tmp/#{file}")
+      end
+      system("rm -Rf tmp/#{name}")
+      system("cd tmp && tar jxf #{file}")
+
+      system("sudo cp -f tmp/#{name}/bin/phantomjs /usr/local/bin/phantomjs")
+      system("sudo chown root:root /usr/local/bin/phantomjs")
+      system("sudo chmod 755 /usr/local/bin/phantomjs")
+    end
+
+  end
+end

data/lib/tasks/publish.rake

@@ -12,8 +12,6 @@ namespace :dad do
     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")
-
     if ENV['BRANCH']
       current_branch = ENV['BRANCH']
     else
@@ -21,22 +19,17 @@ namespace :dad do
       current_branch = git.current_branch
     end
 
-    unless File.exist?('tmp/gh-pages')
-      system("cd tmp && git clone -b gh-pages git@github.com:ichylinux/daddy.git gh-pages")
-    else
-      system("cd tmp/gh-pages && git pull")
-    end
-    system("mkdir -p tmp/gh-pages/#{current_branch}")
+    dir = '/var/lib/daddy/spec'
+    system("sudo mkdir -p #{dir}")
+    system("sudo chown -R #{ENV['USER']}:#{ENV['USER']} #{dir}") 
 
-    system("cd tmp/gh-pages && git rm -r #{current_branch}/screenshots")
-    system("cp -Rf features/reports/* tmp/gh-pages/#{current_branch}/")
+    system("mkdir -p #{dir}/#{current_branch}")
 
-    system("cd tmp/gh-pages && git rm -r #{current_branch}/coverage")
-    system("cp -Rf coverage tmp/gh-pages/#{current_branch}/")
+    system("rm -Rf #{dir}/#{current_branch}/screenshots")
+    system("cp -Rf features/reports/* #{dir}/#{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")
+    system("rm -Rf #{dir}/#{current_branch}/coverage")
+    system("cp -Rf coverage #{dir}/#{current_branch}/")
   end
   
 end

data/lib/tasks/unicorn.erb

@@ -5,17 +5,9 @@
 
 . /etc/rc.d/init.d/functions
 
-if [ -z ${RAILS_USER} ]; then
-  RAILS_USER=<%= ENV['USER'] %>
-fi
-
-if [ -z ${RAILS_ENV} ]; then
-  RAILS_ENV=<%= ENV['RAILS_ENV'] %>
-fi
-
-if [ -z ${RAILS_ROOT} ]; then
-  RAILS_ROOT=<%= ENV['RAILS_ROOT'] %>
-fi
+RAILS_USER=<%= ENV['USER'] %>
+RAILS_ENV=<%= ENV['RAILS_ENV'] %>
+RAILS_ROOT=<%= ENV['RAILS_ROOT'] %>
 
 PID=${RAILS_ROOT}/tmp/pids/unicorn.pid
 CONFIG=${RAILS_ROOT}/config/unicorn.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -94,6 +94,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,7 @@ files:
 - lib/tasks/db_create.rake
 - lib/tasks/unicorn.erb
 - lib/tasks/test.rake
+- lib/tasks/phantomjs.rake
 - lib/tasks/database.yml.erb
 - lib/tasks/nginx.conf.erb
 homepage: https://github.com/ichylinux/daddy