daddy 0.0.10 → 0.0.11

data/lib/daddy/cucumber.rb

@@ -2,6 +2,7 @@
 
 require 'cucumber/rails'
 require 'capybara/webkit'
+require 'daddy/git'
 require 'differ'
 
 Differ.format = :html

data/lib/daddy/cucumber/diff.rb

@@ -0,0 +1,21 @@
+# coding: UTF-8
+
+module Daddy
+  module Cucumber
+    module Diff
+      
+      def git_diff(local_file, git_path)
+        git = Daddy::Git.new
+        a = File.read(local_file).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        b = git.show_previous(git_path, true).gsub(/[<>]/, '<' => '&lt;', '>' => '&gt;')
+        diff = Differ.diff(a, b)
+
+        puts local_file
+        puts "<pre>#{diff}</pre>"
+      end
+
+    end
+  end
+end
+
+World(Daddy::Cucumber::Diff)

data/lib/daddy/formatter/daddy.css

@@ -1,3 +1,7 @@
+.contents {
+  margin-left: 100px;
+}
+
 #menu {
   width: 100px;
   float: left;
@@ -33,10 +37,6 @@
   font-weight: bold;
 }
 
-.contents {
-  margin-left: 100px;
-}
-
 .cucumber .scenario h3, td .scenario h3, th .scenario h3, .background h3 {
   font-size: 11px;
   padding: 3px;
@@ -47,12 +47,16 @@
 }
 
 .cucumber ol li.passed, td ol li.passed, th ol li.passed {
-  border-left: 5px solid #65c400;
-  border-bottom: 1px solid #65c400;
+  border-left: 5px solid #999999;
+  border-bottom: 1px solid #999999;
   background: #FFFFFF;
   color: #000000;
 }
 
+.cucumber ol li.expand:hover, td ol li.expand:hover, th ol li.expand:hover {
+  background: #F0F8FF;
+}
+
 .step_contents {
   display: none;
   background: #FFFFFF;

data/lib/daddy/formatter/html.rb

@@ -271,7 +271,12 @@ module Daddy
         @status = status
         return if @hide_this_step
         set_scenario_color(status)
-        @builder << "<li id='#{@step_id}' class='step #{status}'>"
+        
+        if ! @delayed_messages.empty? and status == :passed
+          @builder << "<li id='#{@step_id}' class='step #{status} expand'>"
+        else
+          @builder << "<li id='#{@step_id}' class='step #{status}'>"
+        end
       end
 
       def after_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)

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

@@ -25,10 +25,10 @@
       <%= title %>
     </li>
     <li class="sub_menu" style="display: none;">
-      <a href="../<%= b %>/index.html">仕様書</a>
+      <a href="../<%= b %>/diary.html">開発日記</a>
     </li>
     <li class="sub_menu" style="display: none;">
-      <a href="../<%= b %>/diary.html">開発日記</a>
+      <a href="../<%= b %>/index.html">仕様書</a>
     </li>
     <li class="sub_menu" style="display: none;">
       <a href="../<%= b %>/coverage/rcov/index.html" target="_blank">カバレッジ</a>

data/lib/daddy/git.rb

@@ -7,19 +7,24 @@ end
 module Daddy
   
   class Git
-    def branches
+    def branches(remote = false)
       branches = []
       `git branch -a`.split("\n").each do |b|
         next if b.index('HEAD')
         next if b.index('gh-pages')
         next unless b.index('remotes/origin/')
-        branches << b.strip.sub('remotes/origin/', '')
+        
+        if remote
+          branches << b.strip
+        else
+          branches << b.strip.sub('remotes/origin/', '')
+        end
       end
       
       branches.sort! do |a, b|
-        if a == 'master'
+        if a == 'master' or a == 'remotes/origin/master'
           -1
-        elsif b == 'master'
+        elsif b == 'master' or b == 'remotes/origin/master'
           1
         else
           b <=> a
@@ -34,6 +39,23 @@ module Daddy
         return b.split.last if b.start_with?('*')
       end
     end
+    
+    def previous_branch(remote = false)
+      current_branch = self.current_branch
+      branches = self.branches(remote)
+
+      branches.each_with_index do |b, i|
+        return nil if i == branches.size - 1
+
+        if b == current_branch or b == "remotes/origin/#{current_branch}"
+          return branches[i+1]
+        end
+      end
+    end
+    
+    def show_previous(file, remote = false)
+      `git show #{previous_branch(remote)}:#{file}`
+    end
   end
 
 end

data/lib/tasks/test.rake

@@ -6,6 +6,6 @@ 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")
+    system("bundle exec rake dad:cucumber #{ARGV[1..-1].join(' ')}")
   end  
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: daddy
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
+  prerelease: 
 platform: ruby
 authors:
 - ichy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: differ
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -199,49 +226,51 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/daddy.rb
-- lib/daddy/cucumber.rb
-- lib/daddy/cucumber/pause.rb
-- lib/daddy/cucumber/capture.rb
+- lib/tasks/dad.rake
+- lib/tasks/cucumber.rake
+- lib/tasks/cucumber_install.rake
+- lib/tasks/test.rake
+- lib/tasks/db_create.rake
+- lib/tasks/publish.rake
+- lib/tasks/cucumber_steps.rake
+- lib/daddy/railtie.rb
+- lib/daddy/cucumber/diff.rb
 - lib/daddy/cucumber/html.rb
-- lib/daddy/cucumber/step_definitions/common.rb
+- lib/daddy/cucumber/capture.rb
 - lib/daddy/cucumber/assert.rb
+- lib/daddy/cucumber/pause.rb
+- lib/daddy/cucumber/step_definitions/common.rb
 - lib/daddy/cucumber/table.rb
-- lib/daddy/git.rb
-- lib/daddy/formatter/menu.html.erb
+- lib/daddy/formatter/cucumber.css
 - lib/daddy/formatter/html.rb
 - lib/daddy/formatter/daddy.css
-- lib/daddy/formatter/cucumber.css
+- lib/daddy/formatter/menu.html.erb
 - lib/daddy/formatter/jquery-min.js
-- lib/daddy/railtie.rb
-- lib/tasks/dad.rake
-- lib/tasks/publish.rake
-- lib/tasks/cucumber_steps.rake
-- lib/tasks/cucumber.rake
-- lib/tasks/cucumber_install.rake
-- lib/tasks/db_create.rake
-- lib/tasks/test.rake
+- lib/daddy/git.rb
+- lib/daddy/cucumber.rb
+- lib/daddy.rb
 homepage: https://github.com/ichylinux/daddy
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: My rails dad
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmE0NDE3MWExODM4MjNmOWFiNTZkMTg4MjA0NzEwYzMzMDU4YzE4ZQ==
-  data.tar.gz: !binary |-
-    NjU0Mzc0ODE5NDA3MDdkZmNlZmJlMzcxYjg1NjE1OTEwM2U3YmEzNA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MmIzYjE4MjllZTc5NGMxZGI4ZTkyYWJhMDdiODg3NDg2Zjk2Y2FjOGE3MTU3
-    NTk5YTQwZDdjNTY3MzViNjdiMzE3ZDk1NDBkNGZjMDVmOGUzNGFjZDA2NGI1
-    NmI0NjI1NDExOTM3NjgxYjlkNDEzNmU1YjAxMjQ3MzYwZDU3MzE=
-  data.tar.gz: !binary |-
-    ZGI5ZDg4NmUyMjMxNjk0MDQzY2YwN2FjNzJkZjZmZGY0ZWNiOWVjMmU3YzRj
-    YWJjNTg4MDM5ZjNjZmZjNTRlMDg2MTIyNjBlODY5MjM3MTE0ZGRjZGQ0Zjdi
-    MzMwMzM0NWUyM2EzY2M2MTBkMjc1Zjc2ZTFhMDNjMDljN2MxZjU=